Aggressive renaming and redesign.