fix naming convertion