More name rules WIP