Updated naming of internal property class