change naming to confirm with new pattern