Fixes name and username format