Is this considered stuttering or stammering?

Is this considered stuttering or stammering? I used to stutter very bad when I was younger, I’d repeat words and all the usual stuttering stuff. Over the years it’s gotten better but a lot of the time now a days I struggle with saying words that begin with vowels and the letters D, P and a few others every now and then. I get blocked right before I say it and the fact my name starts with a vowel will sometimes make me block on it and will take me ages to get it out. However, I rarely ever repeat words or sounds nowadays. I’m a little confused if this would be considered either stuttering or stammering, or are they the same thing?