Update naming and slugging, minor refactoring