Rename (once again) aggregating modules and trim their .hpp extension.