Refactor to avoid ruby naming confusion