Retweaked the naming conventions and new collection management strategies