Adopt the naming convention used in EC