BF - Fixed naming convention for private in Device2501
BF - Continued 2310 implementation.