refactored 2D static factory names