BS-9422,remove schema prefix, fix kind size