Fix naming conventions
Fix split dictionary generation