Improve naming
Fix recursive slug application