Rename classes

remove 'keychain' in class names