Added name capitailzation