Update database key arguments to use a more obvious context