Make attribute definitions consistent