Added success message and homogenised some names