Fixed command to match names/ fixed quit remove names