Some unimportant fixes on names