Fixed some naming inconsitencies