Reverted back underscores in attributes identifiers