Refactored internal property names