component rename + other fixes