Started working on issue #2;
 - As a result, multiple files got renamed.