Changed namespace
Source informations and namespace corrections.