Cohesive naming conventions
Merge branch 'refactor' of github.com:kesapojat/tmc-snapshot-api into refactor