Standardize variable and property names across project