repack, change names and small fix