Fix image and flavor plan parameter names

Change-Id: I3f2bef7e4e9295e5e86aa5dc4fba2fa3156b4e13
Merge "Fix image and flavor plan parameter names"