Added two utility functions for submission filename generation.

Changed Collection model to use proper fields.