Rename for consistency
Provide method to store uniqueId on Installation object
Move helper method to top