BAM-140 Further refactoring related to the rename from BAM to RTGov