change packages and names