Changed files names according to convention
modified test files to incorporate namechanges