module rename and device spefic bug fixes