Changing way things work internally, using some naming conventions for metrics