Changed files names according to convention