Cleaned up file names for general modal/controller usage