Misc changes, big and small

This makes device use retail name when connected via MTP.