Handle some special cases for names (still a dirty hack)