Reworked naming components