Standardize tap import