Changed PrimaryKeyStore constant to "Keystore" and fixed resources files