Change naming to autoform