If we do my suggestion above we can remove this naming code altogether.