Updates to make the different Mortar components start with a capital letter