Change to non-short tags and fix pathing