fix naming, remove some excess imports