Axis code refactoring, names simplifying