Certain fixes and renames. Application still being uncaught.