fix naming issues