Fixes, naming modifications