Refactoring of internal property names