Bugfixes and name conventions for the model and rest interface