Remove instantiating Device and App shorthands

This will prevent namespace conflicts.