Fixes
Fix specs (remove underscore from attributes)