Code review: Remove underscores in property names