Change name to stick to conventions