Files renamed, preventing load fails.

While implementing this in a new project, we had some load fails. Therefore I created this pull request.