Changed file names to be more consistent with repo and UML