Fix 'name' now found
Fix 'name' now found
Merge branch 'feature/MoveToClass' into develop