Various changes to names and seperation of concerns