changed template and collection names to aid in clarity

"message" and "messages" were too similar