Converting names to mechatronics

Still in progress