Naming convention update
Tidying up