Clean up naming of properties in examples