Fix incosistent naming