Revert "Fix column-names"

This reverts commit a21b9681d408f9fcc7b563e1539d1eb980e71778.
Revert "New Scim-Extensions entities"

This reverts commit fd95d11151f70532803e00e3810654d51560504d.