Fixed bad names