Update DropIn for new naming conventions
Merge pull request #1559 from Cottser/dropin

Update DropIn for new naming conventions