Made naming more intuitive and easier to use