Some name refractoring, fixed a name lookup bug in the converters