Messaging: changed file names