Dec update changes #1-#7 (cosmetic renaming)