Indent. and comments
Naming changes for some plans.