Changing names to clearer version