WK refactored names