Added timeToBeat, Naming fixes

Added timeToBeat to the map class.
Fixed nameing conventions in the map related classes.