Adjusted Names for New Component