Cleanup, fix naming