BytecodeCompleter: do not intermix flat and bytecode names