Changed some naming to be more consistent