Renamed the singleton getter/ setter functions for consistency.