Fix-ups: correct module refs; timestamp to varchar

Change-Id: Ic779ef3169c2319039bffa2fd8a23b29d0d2e161