Use more commonly used scrypt parameter names.

[MrBerg]

I think it's better to follow the "official" naming used by Percival to avoid the confusion seen in e.g. this SO thread. Calling r just a 'memory cost parameter' seems misleading.