Avoid constant, use consistent naming of extras with other code