renaming all optional declarations again