Fixing the name up