rename main file
renames and type fixes