Corrected some issue with some types and modules that where not updated.
Corrected incorrectly named files.