fix naming mistakes