Rename some answerfile directives to add consistency

https://bugzilla.redhat.com/show_bug.cgi?id=908771

Change-Id: I537190d96acc5ae7f40371d7abe9e4fe7cb11ee2
Merge "Rename some answerfile directives to add consistency"