Added more special cases for name handling