First pass at renaming interface