fix naming and json for extended