Cleaned up some basenames that weren't needed.