changing naming convention to not use dashes (or underscores) for now, always using camel caps. makes it most flexible for usage with angular, well, i think it might anyway...