Prefixing is optional, update special cases
Update folders, punctuation