Add spells and start refactoring underscore names