Temporary solution to bad names