Import style cleanup and rename to lowercase