Refactored device bridge discovery to improve class naming. Fixed some missing Javadoc params.