Clean and rename

Signed-off-by: komatta91 <komatta91@gmail.com>