Persosim/slutters/generalize changing of passwords

These names are no longer clear in within the new context, see a few lines above and include the INS name within the constants names