v0.6.1

Fixed naming vor entities to make sure that the stricter naming conventions will be fulfilled (no upper cases and spaces in names).