Fixed all name problems