Fixed type specification to not allow terminator as part of name