Adjusted property names