Simplified names now that now collison from refactor