Total taglibs refactor and renaming