Replace STM package. Clean up names