updated to reflect component/keyname changes