update to use modern package naming