[BACKLOG-435] - Fix wrong file names.

@dcleao please review this :-/