More fixes
Fix for specs and a little bit of renaming for clarity