Fix for memory leak, general naming clean ups.