Rename and add comments to core modules