Bug 928668 - Provide better gear storage messages

Use terminology more in keeping with our UI messaging

@pravisankar review please