Refactor minor

Renames
Fix to quadra magic and barrier