Minor changes to naming of all classes and changed WithinRange and Range conditions