Match Mason component names
Update mason.vim header