Refactored some variable names to fix registry mismatches

Argh, I cannot do this for the interface block as 'interface' is a
reserved keyword. Welp, the warning message can be safely ignored
anyway.

Fixes #54