Misc name cleanups, ajax template in progress