Small naming conventions fixes, let the user to choose its delimiter