Added more invalid name handling