[misc] clean up and rename