Refactor to easy english names