Customizations and rename