Fix init functions to work recursively on both Mac and Linux
Make controllers short name shorter