Fix some naming issues left from developing