fix some names and optimize imports