Renamed a bunch of methods to better understand the maintenance calculations

Renamed them with the rename refactoring tool provided by my IDE so it should be safe.

Looks like all of these are no risky changes.