Fixed some naming scheme stuff