Standardise file name and key name inconsistencies.

Signed-off-by: Craig Phillips <craig@craigphillips.biz>