Couple bug fixes for mono/linux, additional cleanup from file renames