emodel: Changed some naming convention to look less odd and make more sense.