Names changed according to convention