Fixing some conventions