Revert to old naming; Add future import